Revert 20505:44ea369eefc1

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index e916d46faf9080d132e2965c18693342868add02..aebfdd18a6e75bd71826c7ace1065f0307eef77c 100644 (file)
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1221,12 +1221,6 @@ p2m_gfn_to_mfn(struct domain *d, unsigned long gfn, p2m_type_t *t,
 
     ASSERT(paging_mode_translate(d));
 
-    if ( unlikely(d->is_dying) )
-    {
-        *t = p2m_invalid;
-        return _mfn(INVALID_MFN);
-    }
-
     /* XXX This is for compatibility with the old model, where anything not 
      * XXX marked as RAM was considered to be emulated MMIO space.
      * XXX Once we start explicitly registering MMIO regions in the p2m 

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index f6cc319f86d4968c568dd5157985288851c75b3d..94457a328186a4a41ab22987eaa49a2afd5495ec 100644 (file)
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2171,7 +2171,6 @@ static void hash_foreach(struct vcpu *v,
 
     /* Say we're here, to stop hash-lookups reordering the chains */
     ASSERT(shadow_locked_by_me(d));
-    ASSERT(d->arch.paging.shadow.hash_table);
     ASSERT(d->arch.paging.shadow.hash_walking == 0);
     d->arch.paging.shadow.hash_walking = 1;
 
@@ -3450,12 +3449,6 @@ shadow_write_p2m_entry(struct vcpu *v, unsigned long gfn,
     
     shadow_lock(d);
 
-    if ( unlikely(d->is_dying) )
-    {
-        shadow_unlock(d);
-        return;
-    }
-
     /* If we're removing an MFN from the p2m, remove it from the shadows too */
     if ( level == 1 )
     {